Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 23 Sep 2011 14:42:06 +0000 (07:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 23 Sep 2011 14:42:06 +0000 (07:42 -0700)

Trivial merge